From e3846a5eea6f155fdde0b0927f2eb9f0d3f76ef3 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 19 Nov 2003 00:56:59 +0000
Subject: [PATCH] Merge several bits into wlshowlast

---
 includes/SpecialWatchlist.php | 10 ++++------
 languages/Language.php        |  5 +----
 languages/LanguageDe.php      |  4 +---
 languages/LanguageEo.php      |  3 ++-
 languages/LanguageNl.php      |  4 +---
 languages/LanguageSr.php      |  4 +---
 6 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index e5749e12cd..7ec0fdd297 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -205,12 +205,10 @@ function wlCutoffLinks( $days, $limit, $page = "Watchlist" )
 	foreach( $days as $d ) {
 		$days[$i++] = wlDaysLink( $d, $page );
 	}
-	return
-		wfMsg ("wlshowlast") .
-		implode(" | ", $hours) . wfMsg("wlhours") .
-		implode(" | ", $days) . wfMsg("wldays") .
-		wlDaysLink( 0, $page );
-#	$note = wfMsg( "rclinks", $cl, $dl, $mlink );
+	return wfMsg ("wlshowlast",
+		implode(" | ", $hours),
+		implode(" | ", $days),
+		wlDaysLink( 0, $page ) );
 }
 
 ?>
diff --git a/languages/Language.php b/languages/Language.php
index f54a5a6d24..b27421f808 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1049,10 +1049,7 @@ at the bottom of the screen.",
 "couldntremove" => "Couldn't remove item '$1'...",
 "iteminvalidname" => "Problem with item '$1', invalid name...",
 "wlnote" => "Below are the last $1 changes in the last <b>$2</b> hours.",
-"wlshowlast" => "Show last ",
-"wlhours"    => " hours",
-"wldays"     => " days",
-                                                                                                                                       
+"wlshowlast" => "Show last $1 hours $2 days $3",
 
 # Delete/protect/revert
 #
diff --git a/languages/LanguageDe.php b/languages/LanguageDe.php
index b47a49739d..aca708b687 100644
--- a/languages/LanguageDe.php
+++ b/languages/LanguageDe.php
@@ -729,9 +729,7 @@ $3... <a href='$4'>komplette Liste zeigen und bearbeiten</a>.)",
 "couldntremove" => "Der Eintrag '$1' kann nicht gelöscht werden...",
 "iteminvalidname" => "Ploblem mit dem Eintrag '$1', ungültiger Name...",
 "wlnote" => "Es folgen die letzten $1 Änderungen der letzten <b>$2</b> Stunden.",
-"wlshowlast" => "Zeige die letzen ",
-"wlhours"    => " Stunden",
-"wldays"     => " Tage",
+"wlshowlast" => "Zeige die letzen $1 Stunden $2 Tage $3",
 
 # Delete/protect/revert
 #
diff --git a/languages/LanguageEo.php b/languages/LanguageEo.php
index eaa17ed206..3b7a8a1199 100644
--- a/languages/LanguageEo.php
+++ b/languages/LanguageEo.php
@@ -606,7 +606,7 @@ de ĉi tiu dosiero konsentas eldoni ĝin laŭ la $1.",
 "minlength"		=> "Dosiernomo devas havi pli ol du literojn.",
 "badfilename"	=> "Dosiernomo estis ŝanĝita al \"$1\".",
 "badfiletype"	=> "\".$1\" estas dosiertipo malrekomendata.",
-"largefile"		=> "Oni rekomendas, ke dosieroj ne superu grandon de 100 megabitoj.",
+"largefile"		=> "Oni rekomendas, ke dosieroj ne superu grandon de 100 kilobitoj.",
 "successfulupload" => "Alŝuto sukcesis!",
 "fileuploaded"	=> "Vi sukcese alŝutis dosieron \"$1\".
 Bonvolu sekvi la jenan ligilo: ($2) al la priskrib-paĝo kaj
@@ -777,6 +777,7 @@ Elektu forigotajn paĝojn kaj alklaku 'forprenu elektitajn' sube.",
 "couldntremove" => "Neeblas forigi titolon '$1'...",
 "iteminvalidname" => "Ia eraro pri '$1', nevalida titolo...",
 "wlnote" => "Jen la lastaj $1 redaktoj de la lastaj <b>$2</b> horoj.",
+"wlshowlast" => "Montru el lastaj $1 horoj $2 tagoj $3",
 
 
 # Delete/protect/revert
diff --git a/languages/LanguageNl.php b/languages/LanguageNl.php
index 643e775878..7367bc41b4 100644
--- a/languages/LanguageNl.php
+++ b/languages/LanguageNl.php
@@ -858,9 +858,7 @@ op 'Verwijderen' onderaan deze pagina.",
 "couldntremove" => "Verwijdering van '$1' onmogelijk.",
 "iteminvalidname" => "Incorrecte naam '$1'",
 "wlnote" => "Getoond worden de laatste $1 wijzigingen in de laatste $2 uur.",
-"wlshowlast" => "Toon de laatste ",
-"wlhours" => "uur",
-"wldays" => "dagen",
+"wlshowlast" => "Toon de laatste $1 uur $2 dagen $3",
 
 # Delete/protect/revert
 # Verwijderen/beschermen/annuleren
diff --git a/languages/LanguageSr.php b/languages/LanguageSr.php
index 327ae6d764..93fd082166 100644
--- a/languages/LanguageSr.php
+++ b/languages/LanguageSr.php
@@ -837,9 +837,7 @@ $3...
 "couldntremove" => "Не могу да уклоним '$1'...",
 "iteminvalidname" => "Проблем са '$1', неисправно име...",
 "wlnote" => "Испод је последњих $1 измена у последњих <b>$2</b> сати.",
-"wlshowlast" => "Прикажи последњих ",
-"wlhours"    => " сати",
-"wldays"     => " дана",
+"wlshowlast" => "Прикажи последњих $1 сати $2 дана $3",
 
 
 # Delete/protect/revert
-- 
2.20.1